merge emacs-24
authorKenichi Handa <handa@gnu.org>
Thu, 13 Dec 2012 13:55:36 +0000 (22:55 +0900)
committerKenichi Handa <handa@gnu.org>
Thu, 13 Dec 2012 13:55:36 +0000 (22:55 +0900)
commit90fb846f2fe64e65dce9d650914d8935ee730b4b
tree747ac169f8a761067f25d69a6059fe89138c60e1
parented134ea42507ac98d0a4c756fb9711cff07b755d
parentfed0f22c1b3ea8b34c8fbaf17da3643edeee1088
merge emacs-24